From 64f1e8378b3c9e8cb1c900a1c5ed1a78edd37281 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 9 Nov 2005 02:13:35 +0000 Subject: [PATCH] gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32) Store the type 2005-11-09 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32) * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init, gdk_window_get_type_hint, gdk_window_get_type_hint): Store the type hint. Implement gdk_window_get_type_hint() by just returning the hint stored. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ gdk/win32/gdkwindow-win32.c | 15 +++++++++++++++ gdk/win32/gdkwindow-win32.h | 2 ++ 4 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index 193ee86051..91a5b42b79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-09 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32) + * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init, + gdk_window_get_type_hint, gdk_window_get_type_hint): Store the + type hint. Implement gdk_window_get_type_hint() by just returning + the hint stored. + 2005-11-09 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 193ee86051..91a5b42b79 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-11-09 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32) + * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init, + gdk_window_get_type_hint, gdk_window_get_type_hint): Store the + type hint. Implement gdk_window_get_type_hint() by just returning + the hint stored. + 2005-11-09 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints): diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index e955fc7950..5c867d3260 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -132,6 +132,7 @@ gdk_window_impl_win32_init (GdkWindowImplWin32 *impl) impl->hicon_big = NULL; impl->hicon_small = NULL; impl->hint_flags = 0; + impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL; impl->extension_events_selected = FALSE; } @@ -3144,6 +3145,9 @@ gdk_window_set_type_hint (GdkWindow *window, GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: %p: %d\n", GDK_WINDOW_HWND (window), hint)); + + GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->type_hint = hint; + switch (hint) { case GDK_WINDOW_TYPE_HINT_DIALOG: @@ -3180,6 +3184,17 @@ gdk_window_set_type_hint (GdkWindow *window, } } +GdkWindowTypeHint +gdk_window_get_type_hint (GdkWindow *window) +{ + g_return_val_if_fail (GDK_IS_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL); + + if (GDK_WINDOW_DESTROYED (window)) + return GDK_WINDOW_TYPE_HINT_NORMAL; + + return GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->type_hint; +} + void gdk_window_shape_combine_region (GdkWindow *window, GdkRegion *shape_region, diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h index 62debe513d..892110b5a1 100644 --- a/gdk/win32/gdkwindow-win32.h +++ b/gdk/win32/gdkwindow-win32.h @@ -83,6 +83,8 @@ struct _GdkWindowImplWin32 gint hint_flags; GdkGeometry hints; + GdkWindowTypeHint type_hint; + gboolean extension_events_selected; }; -- 2.30.2